Merge cherrypicks of ['googleplex-android-review.googlesource.com/22301096'] into udc-release. Change-Id: Ief92ffc57628e20816128c26686df7ad2f3fea2b